From 6fe3d87b10596806abadffadde6a3e91edd98fe4 Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Tue, 31 Jul 2001 20:12:01 +0000 Subject: [PATCH] Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. * gdk/gdkprivate.h: * gdk/x11/gdkx.h: Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not GTK_OBJECT. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ demos/gtk-demo/menus.c | 2 +- gdk/gdkprivate.h | 27 +++++++++++---------------- gdk/x11/gdkx.h | 41 ++++++++++++++++++++++++++--------------- 10 files changed, 101 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fb3ffb8c99..97adfc497c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-07-31 Darin Adler + + * gdk/gdkprivate.h: + * gdk/x11/gdkx.h: + Put all mentions of GdkFont inside #ifndef GDK_DISABLE_DEPRECATED. + + * demos/gtk-demo/menus.c: (do_menus): Cast to G_OBJECT, not + GTK_OBJECT. + Tue Jul 31 15:34:57 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_remove_column): Whoops. Stupid diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c index cdc07e222f..8411eabbe1 100644 --- a/demos/gtk-demo/menus.c +++ b/demos/gtk-demo/menus.c @@ -100,7 +100,7 @@ do_menus (void) NULL); accel_group = gtk_accel_group_new (); - gtk_accel_group_attach (accel_group, GTK_OBJECT (window)); + gtk_accel_group_attach (accel_group, G_OBJECT (window)); gtk_window_set_title (GTK_WINDOW (window), "menus"); gtk_container_set_border_width (GTK_CONTAINER (window), 0); diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h index c8799541c0..1bc8cc8626 100644 --- a/gdk/gdkprivate.h +++ b/gdk/gdkprivate.h @@ -36,9 +36,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L) #define GDK_NO_BG ((GdkPixmap *)2L) @@ -47,16 +45,9 @@ extern "C" { #define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed) typedef struct _GdkColorInfo GdkColorInfo; -typedef struct _GdkFontPrivate GdkFontPrivate; typedef struct _GdkEventFilter GdkEventFilter; typedef struct _GdkClientFilter GdkClientFilter; -struct _GdkFontPrivate -{ - GdkFont font; - guint ref_count; -}; - typedef enum { GDK_COLOR_WRITEABLE = 1 << 0 } GdkColorInfoFlags; @@ -84,14 +75,18 @@ GDKVAR GdkWindow *gdk_parent_root; GDKVAR gint gdk_error_code; GDKVAR gint gdk_error_warnings; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GDK_PRIVATE_H__ */ +#ifndef GDK_DISABLE_DEPRECATED +typedef struct _GdkFontPrivate GdkFontPrivate; +struct _GdkFontPrivate +{ + GdkFont font; + guint ref_count; +}; +#endif /* GDK_DISABLE_DEPRECATED */ +G_END_DECLS +#endif /* __GDK_PRIVATE_H__ */ diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 40b8b954c0..fdb3848fd5 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -36,9 +36,10 @@ #include #include +G_BEGIN_DECLS + typedef struct _GdkColormapPrivateX11 GdkColormapPrivateX11; typedef struct _GdkCursorPrivate GdkCursorPrivate; -typedef struct _GdkFontPrivateX GdkFontPrivateX; typedef struct _GdkImagePrivateX11 GdkImagePrivateX11; typedef struct _GdkVisualPrivate GdkVisualPrivate; @@ -49,17 +50,6 @@ struct _GdkCursorPrivate Display *xdisplay; }; -struct _GdkFontPrivateX -{ - GdkFontPrivate base; - /* XFontStruct *xfont; */ - /* generic pointer point to XFontStruct or XFontSet */ - gpointer xfont; - Display *xdisplay; - - GSList *names; -}; - struct _GdkVisualPrivate { GdkVisual visual; @@ -139,8 +129,6 @@ GType gdk_gc_x11_get_type (void); #define GDK_COLORMAP_XDISPLAY(cmap) (((GdkColormapPrivateX11 *)GDK_COLORMAP (cmap)->windowing_data)->xdisplay) #define GDK_COLORMAP_XCOLORMAP(cmap) (((GdkColormapPrivateX11 *)GDK_COLORMAP (cmap)->windowing_data)->xcolormap) #define GDK_VISUAL_XVISUAL(vis) (((GdkVisualPrivate *) vis)->xvisual) -#define GDK_FONT_XDISPLAY(font) (((GdkFontPrivate *) font)->xdisplay) -#define GDK_FONT_XFONT(font) (((GdkFontPrivateX *)font)->xfont) #define GDK_GC_XGC(gc) (GDK_GC_X11(gc)->xgc) #define GDK_GC_GET_XGC(gc) (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : GDK_GC_XGC (gc)) @@ -186,8 +174,31 @@ void gdk_x11_ungrab_server (void); #define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid)) #define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid)) -#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup (xid)) GC _gdk_x11_gc_flush (GdkGC *gc); +#ifndef GDK_DISABLE_DEPRECATED + +typedef struct _GdkFontPrivateX GdkFontPrivateX; + +struct _GdkFontPrivateX +{ + GdkFontPrivate base; + /* XFontStruct *xfont; */ + /* generic pointer point to XFontStruct or XFontSet */ + gpointer xfont; + Display *xdisplay; + + GSList *names; +}; + +#define GDK_FONT_XDISPLAY(font) (((GdkFontPrivate *) font)->xdisplay) +#define GDK_FONT_XFONT(font) (((GdkFontPrivateX *)font)->xfont) + +#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup (xid)) + +#endif /* GDK_DISABLE_DEPRECATED */ + +G_END_DECLS + #endif /* __GDK_X_H__ */ -- 2.30.2